diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-21 10:09:34 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-21 10:09:34 +0100 |
| commit | 3143e276864a65485db61034f77fcf201f5860e7 (patch) | |
| tree | c6b197fc35ad21a3925134bbe7cb2a204f766f8f | |
| parent | 72a525a0ab6e297477e0068b874d40318caa77a3 (diff) | |
| parent | 1c1dfcb66b25c5dd387dfc7ff83e7b43146ae481 (diff) | |
| download | Chimère - projet Saclay-3143e276864a65485db61034f77fcf201f5860e7.tar.bz2 Chimère - projet Saclay-3143e276864a65485db61034f77fcf201f5860e7.zip | |
Merge branch 'master-v3.0' into saclay-v3.0
Conflicts:
templates/chimere/blocks/share_bar.html
| -rw-r--r-- | templates/chimere/blocks/share_bar.html | 14 | ||||
| -rw-r--r-- | templates/chimere/detail.html | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/templates/chimere/blocks/share_bar.html b/templates/chimere/blocks/share_bar.html index e8f3474..32e8e82 100644 --- a/templates/chimere/blocks/share_bar.html +++ b/templates/chimere/blocks/share_bar.html @@ -5,7 +5,10 @@ {% endfor %}{%else%} <ul class='share'> <li class='share-send'><a class='share_link share_id_{{share_networks.0.0}}{% if email_only %}_single{%endif%}' href='{{share_networks.0.1}}'><img src="{{share_network.0.2}}" alt="{{share_network.0.0}}"/></a></li> - {% if not email_only %}<li class='share-icon'><a href="#">{% trans "Share" %}</a></li>{% for share_network in share_networks %} + {% if not email_only %} + <li class="share-link-main"> + <a href="#">{% trans "Share" %}</a></li> + {% for share_network in share_networks %} <li class='shared'><a class='share_link share_id_{{share_network.0}}' href='{{share_network.1}}'><img src="{{share_network.2}}" alt="{{share_network.0}}"/></a></li> {% endfor %} {% if rss %}<li class='shared'><a href='{% url "chimere:feeds-global" %}'><img src='{{STATIC_URL}}chimere/img/feed.png' alt='Feeds'/></a></li>{% endif %}{%endif%} @@ -14,6 +17,15 @@ <!-- $(function(){ share_link_update(); + $('.share-link-main').click(function(){ + update_permalink(); + var params = $('#permalink').attr('href').split('#')[1]; + var current_url = String(window.location.href).split('#')[0] + + "#" + params; + var message = "{% trans 'Copy and paste this address to share this item: \n' %}"; + message += current_url; + alert(message); + }); }); // --> </script> diff --git a/templates/chimere/detail.html b/templates/chimere/detail.html index e106115..798cd4f 100644 --- a/templates/chimere/detail.html +++ b/templates/chimere/detail.html @@ -44,7 +44,7 @@ </ul> {% share_bar marker.name '' '' %} {% comment %} - <a href='{% if marker.route %}{% url 'chimere:editroute-item' area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:edit-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'> + <a href='{% if marker.route %}{% url "chimere:editroute-item" area_name_slash|default_if_none:"" marker.route.pk "" %}{%else%}{% url 'chimere:edit-item' area_name_slash|default_if_none:"" marker.pk "" %}{%endif%}'> {% trans "Submit a modification" %} </a> {% endcomment %} |